Improve blame file type detection (#1803) #1829
Open
+203
−164
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
th1000s
reviewed
Sep 2, 2024
src/utils/process.rs
Outdated
Comment on lines
728
to
731
|
|
||
| let args = make_string_vec(&["git", "blame", "-w", "-C", "main.rs"]); | ||
| assert_eq!(guess_git_blame_filename(&args), Args("main.rs".into())); | ||
|
|
There was a problem hiding this comment.
That unfortunately doesn't really fix it: Now -w takes an argument (when it does not), which means it "eats" the following -C. The problem is -C[<num>], which only takes a non-whitespace argument (or none) -- but this not really modeled at the moment.
Removing -C from the previous list should work for most cases. In the future a fallback to take the last argument containing a . should be added. And make it use the CallingProcess enum as mentioned in the TODO there.
There was a problem hiding this comment.
I've been tricked by only looking at the synopsis part of the git blame man page when adding -w to this list.
I'll look at addressing this TODO and making a variant in CallingProcess.
dvermd
force-pushed
the
improve_blame_filetype_detection
branch
from
5392bc4
to
c5bc7ed
Compare
Signed-off-by: dvermd <[email protected]>
dvermd
force-pushed
the
improve_blame_filetype_detection
branch
from
c5bc7ed
to
aa78604
Compare
Signed-off-by: dvermd <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #1803